From a9ca520ba1ff5d80c19c979ba5e5e1ff229fc9bf Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Sun, 21 May 2006 07:49:46 -0600 Subject: [PATCH] [IA64] Enable P2M/VP by default Signed-off-by: Alex Williamson --- buildconfigs/linux-defconfig_xen0_ia64 | 40 ++++++++++++++------------ buildconfigs/linux-defconfig_xenU_ia64 | 34 +++++++++------------- buildconfigs/linux-defconfig_xen_ia64 | 40 ++++++++++++++------------ xen/arch/ia64/Rules.mk | 2 +- 4 files changed, 57 insertions(+), 59 deletions(-) diff --git a/buildconfigs/linux-defconfig_xen0_ia64 b/buildconfigs/linux-defconfig_xen0_ia64 index 7d7aa15e03..c5df7e3aa3 100644 --- a/buildconfigs/linux-defconfig_xen0_ia64 +++ b/buildconfigs/linux-defconfig_xen0_ia64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-xen0 -# Mon Mar 27 14:46:03 2006 +# Linux kernel version: 2.6.16.13-xen0 +# Sun May 21 07:42:37 2006 # # @@ -92,13 +92,7 @@ CONFIG_EFI=y CONFIG_GENERIC_IOMAP=y CONFIG_XEN=y CONFIG_ARCH_XEN=y -CONFIG_XEN_PRIVILEGED_GUEST=y -# CONFIG_XEN_IA64_DOM0_VP is not set -CONFIG_XEN_BLKDEV_GRANT=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_BACKEND=y -CONFIG_XEN_BLKDEV_BACKEND=y -CONFIG_XEN_SYSFS=y +CONFIG_XEN_IA64_DOM0_VP=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_IS_DMA32=y # CONFIG_IA64_GENERIC is not set @@ -1523,19 +1517,27 @@ CONFIG_CRYPTO_DES=y # # Hardware crypto devices # -# CONFIG_NO_IDLE_HZ is not set -# CONFIG_XEN_PCIDEV_BACKEND is not set -# CONFIG_XEN_BLKDEV_TAP_BE is not set -# CONFIG_XEN_NETDEV_BACKEND is not set -# CONFIG_XEN_TPMDEV_BACKEND is not set -# CONFIG_XEN_NETDEV_FRONTEND is not set -# CONFIG_XEN_BLKDEV_TAP is not set -# CONFIG_XEN_SCRUB_PAGES is not set -# CONFIG_HAVE_ARCH_ALLOC_SKB is not set -# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set +CONFIG_HAVE_ARCH_ALLOC_SKB=y +CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_XEN_INTERFACE_VERSION=0x00030202 # # XEN # +CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set +CONFIG_XEN_BACKEND=y +# CONFIG_XEN_PCIDEV_BACKEND is not set +CONFIG_XEN_BLKDEV_BACKEND=y +# CONFIG_XEN_BLKDEV_TAP_BE is not set +CONFIG_XEN_NETDEV_BACKEND=y +# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set +CONFIG_XEN_NETDEV_LOOPBACK=y +# CONFIG_XEN_TPMDEV_BACKEND is not set +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y +# CONFIG_XEN_BLKDEV_TAP is not set +# CONFIG_XEN_SCRUB_PAGES is not set # CONFIG_XEN_DISABLE_SERIAL is not set +CONFIG_XEN_SYSFS=y +CONFIG_NO_IDLE_HZ=y diff --git a/buildconfigs/linux-defconfig_xenU_ia64 b/buildconfigs/linux-defconfig_xenU_ia64 index b27910025c..f2f4ae5ceb 100644 --- a/buildconfigs/linux-defconfig_xenU_ia64 +++ b/buildconfigs/linux-defconfig_xenU_ia64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-xenU -# Mon Mar 27 14:01:13 2006 +# Linux kernel version: 2.6.16.13-xenU +# Sun May 21 07:46:14 2006 # # @@ -89,13 +89,7 @@ CONFIG_EFI=y CONFIG_GENERIC_IOMAP=y CONFIG_XEN=y CONFIG_ARCH_XEN=y -CONFIG_XEN_PRIVILEGED_GUEST=y -# CONFIG_XEN_IA64_DOM0_VP is not set -CONFIG_XEN_BLKDEV_GRANT=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_BACKEND=y -CONFIG_XEN_BLKDEV_BACKEND=y -CONFIG_XEN_SYSFS=y +CONFIG_XEN_IA64_DOM0_VP=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_IS_DMA32=y # CONFIG_IA64_GENERIC is not set @@ -1387,19 +1381,19 @@ CONFIG_CRYPTO_DES=y # # Hardware crypto devices # -# CONFIG_NO_IDLE_HZ is not set -# CONFIG_XEN_PCIDEV_BACKEND is not set -# CONFIG_XEN_BLKDEV_TAP_BE is not set -# CONFIG_XEN_NETDEV_BACKEND is not set -# CONFIG_XEN_TPMDEV_BACKEND is not set -# CONFIG_XEN_NETDEV_FRONTEND is not set -# CONFIG_XEN_BLKDEV_TAP is not set -# CONFIG_XEN_SCRUB_PAGES is not set -# CONFIG_HAVE_ARCH_ALLOC_SKB is not set -# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set +CONFIG_HAVE_ARCH_ALLOC_SKB=y +CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_XEN_INTERFACE_VERSION=0x00030202 # # XEN # -# CONFIG_XEN_UNPRIVILEGED_GUEST is not set +# CONFIG_XEN_PRIVILEGED_GUEST is not set +CONFIG_XEN_UNPRIVILEGED_GUEST=y +# CONFIG_XEN_BACKEND is not set +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y +# CONFIG_XEN_SCRUB_PAGES is not set # CONFIG_XEN_DISABLE_SERIAL is not set +CONFIG_XEN_SYSFS=y +CONFIG_NO_IDLE_HZ=y diff --git a/buildconfigs/linux-defconfig_xen_ia64 b/buildconfigs/linux-defconfig_xen_ia64 index 5ac52b3508..915eea02d9 100644 --- a/buildconfigs/linux-defconfig_xen_ia64 +++ b/buildconfigs/linux-defconfig_xen_ia64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.16-xen -# Mon Mar 27 14:36:21 2006 +# Linux kernel version: 2.6.16.13-xen +# Sun May 21 07:46:58 2006 # # @@ -92,13 +92,7 @@ CONFIG_EFI=y CONFIG_GENERIC_IOMAP=y CONFIG_XEN=y CONFIG_ARCH_XEN=y -CONFIG_XEN_PRIVILEGED_GUEST=y -# CONFIG_XEN_IA64_DOM0_VP is not set -CONFIG_XEN_BLKDEV_GRANT=y -CONFIG_XEN_BLKDEV_FRONTEND=y -CONFIG_XEN_BACKEND=y -CONFIG_XEN_BLKDEV_BACKEND=y -CONFIG_XEN_SYSFS=y +CONFIG_XEN_IA64_DOM0_VP=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y CONFIG_DMA_IS_DMA32=y # CONFIG_IA64_GENERIC is not set @@ -1529,19 +1523,27 @@ CONFIG_CRYPTO_DES=y # # Hardware crypto devices # -# CONFIG_NO_IDLE_HZ is not set -# CONFIG_XEN_PCIDEV_BACKEND is not set -# CONFIG_XEN_BLKDEV_TAP_BE is not set -# CONFIG_XEN_NETDEV_BACKEND is not set -# CONFIG_XEN_TPMDEV_BACKEND is not set -# CONFIG_XEN_NETDEV_FRONTEND is not set -# CONFIG_XEN_BLKDEV_TAP is not set -# CONFIG_XEN_SCRUB_PAGES is not set -# CONFIG_HAVE_ARCH_ALLOC_SKB is not set -# CONFIG_HAVE_ARCH_DEV_ALLOC_SKB is not set +CONFIG_HAVE_ARCH_ALLOC_SKB=y +CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_XEN_INTERFACE_VERSION=0x00030202 # # XEN # +CONFIG_XEN_PRIVILEGED_GUEST=y # CONFIG_XEN_UNPRIVILEGED_GUEST is not set +CONFIG_XEN_BACKEND=y +# CONFIG_XEN_PCIDEV_BACKEND is not set +CONFIG_XEN_BLKDEV_BACKEND=y +# CONFIG_XEN_BLKDEV_TAP_BE is not set +CONFIG_XEN_NETDEV_BACKEND=y +# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set +CONFIG_XEN_NETDEV_LOOPBACK=y +# CONFIG_XEN_TPMDEV_BACKEND is not set +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_NETDEV_FRONTEND=y +# CONFIG_XEN_BLKDEV_TAP is not set +# CONFIG_XEN_SCRUB_PAGES is not set # CONFIG_XEN_DISABLE_SERIAL is not set +CONFIG_XEN_SYSFS=y +CONFIG_NO_IDLE_HZ=y diff --git a/xen/arch/ia64/Rules.mk b/xen/arch/ia64/Rules.mk index 87192e4987..be8deb2ba4 100644 --- a/xen/arch/ia64/Rules.mk +++ b/xen/arch/ia64/Rules.mk @@ -3,7 +3,7 @@ HAS_ACPI := y VALIDATE_VT ?= n -xen_ia64_dom0_virtual_physical ?= n +xen_ia64_dom0_virtual_physical ?= y no_warns ?= n ifneq ($(COMPILE_ARCH),$(TARGET_ARCH)) -- 2.30.2